bitkeeper revision 1.1704 (42a885cb3_kkMMOYtYN_PaWP3tupbA)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 9 Jun 2005 18:09:15 +0000 (18:09 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 9 Jun 2005 18:09:15 +0000 (18:09 +0000)
commit996fe4998ae9ffa064fc6d087d054b5be9fbc001
tree78b76bb6d67aaf7c0be6fe300ec50f241646de98
parent857be0b87b7c39ba521d9f42586035c3ba20edea
bitkeeper revision 1.1704 (42a885cb3_kkMMOYtYN_PaWP3tupbA)

Merge Scotts's pte_mfn patch with some extra merging between xen/i386
and xen/x86_64. An obvious further step is to fix xen/x86_64's
pci-dma.c and pci-nommu.c to be closer to native x86_64 versions.
Signed-off-by: Scott Parish <srparish@us.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
18 files changed:
.rootkeys
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
linux-2.6.11-xen-sparse/arch/xen/kernel/evtchn.c
linux-2.6.11-xen-sparse/arch/xen/kernel/gnttab.c
linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/pci-dma.c
linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/Makefile
linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/hypervisor.c [deleted file]
linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c
linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h
linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/synch_bitops.h
linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/system.h
linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h
linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/synch_bitops.h [deleted file]
linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/system.h
linux-2.6.11-xen-sparse/include/asm-xen/evtchn.h
linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
linux-2.6.11-xen-sparse/include/asm-xen/synch_bitops.h [new file with mode: 0644]